Merge version 1.85.0+dfsg3-1+rpi1 and 1.85.1+dfsg1-1+deb13u1 to produce 1.85.1+dfsg1...

diff --cc debian/changelog
index 01c6037de95979fa87222d6ec72e475d49dcb649,8712f0694608d1e541f8f057bd4ed08e3345c78d..c8ae15924e217e042a390fcd81a12a730640818f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,12 +1,29 @@@
- rustc (1.85.0+dfsg3-1+rpi1) trixie-staging; urgency=medium
++rustc (1.85.1+dfsg1-1+deb13u1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
 +  [changes introduced in 1.85.0+dfsg2-2+rpi1 by Peter Michael Green]
 +  * Cherry pick upstream fixes for documentation build on arm32.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 05 May 2025 20:21:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Sep 2026 17:34:13 +0000
++
+ rustc (1.85.1+dfsg1-1+deb13u1) trixie; urgency=medium
+ 
+   * New upstream point release 1.85.1 (Closes: #1135220)
+     - fix doctest merging with edition 2024
+     - fix rustdoc on 32-bit ARM
+   * backport tar CVE-2026-33055/CVE-2026-33056 fixes (Closes: #1135225)
+   * cherry-pick cargo CVE-2026-5222/CVE-2026-5223 fixes
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 24 Jul 2026 18:02:33 +0200
  
  rustc (1.85.0+dfsg3-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 03a67ba6e17743a52d54dd019d74623729696c16,e52b5f9a14d5d925c0a15a6079887cf6feff257f..a298846429e9fe7661d50ba9d578c145f8ac0b58
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -48,7 -48,7 +48,11 @@@ bootstrap/bootstrap-revert-cross-build-
  vendor/cargo-update-git2-bindings.patch
  vendor/gitoxide-backport-fix-for-CVE-2025-31130.patch
  upstream/RUSTSEC-2025-0024-sync-mpsc-prevent-double-free-on-Drop.patch
+ vendor/tar-CVE-2026-33056.patch
+ vendor/tar-CVE-2026-33055.patch
+ cargo/CVE-2026-5222-avoid-stripping-.git-suffix-when-for-non-gi.patch
+ cargo/CVE-2026-5223-prohibit-unpacking-symlinks-and-other-unexp.patch
 +rustdoc-disable-forbidden-target_feature.patch
 +also-fix-potential-issues-with-mixed-sta.patch
 +add-test.patch
 +also-skip-abi_required_features-check-in.patch